Olaf changes TEF to use UTF8 internally, fixes doc, tweaks tests.

diff --git a/gpsbabel/README b/gpsbabel/README
index fda4476515e34ca2bba2a2e0f56a9049dffced57..b47d0f30c92fe9d7c30a264f5eed2c769c642e20 100644 (file)
--- a/gpsbabel/README
+++ b/gpsbabel/README
@@ -788,11 +788,19 @@ THE FORMATS
         XHTML beyond recognition so use a better browser to save the
         pages such as Firefox or Mozilla.
 
-    TourExchangeFormat
-
-        XML based export format, used by Map&Guide
-        "Motorrad-Routenplaner". This software can only export routing
-        data.  So we don't support writing.
+    TEF
+
+        TEF, internal called "TourExchangeFormat", is a XML based 
+       export format, used by Map&Guide "Motorrad-Routenplaner 2005/06".
+       Another posibility to exchange data with this are the .bcr files,
+       which are sopprted by GPSbabel in both directions (see BCR).
+       Via XML this software can only export routing data.  
+       So we don't support writing. 
+       
+       With the option "routevia" you can eliminate calculated route
+       points from tef source file.
+       
+       gpsbabel -r -i tef,routevia -f in.xml -o gpx -F out.gpx
 
     PathAway
 

diff --git a/gpsbabel/reference/route/tef_xml.sample.gpx b/gpsbabel/reference/route/tef_xml.sample.gpx
index d55ae922af77fdba42725e97761738760c9c7282..969fcc283d2d19a2f84ccd8d884882e4bf492f9e 100644 (file)
--- a/gpsbabel/reference/route/tef_xml.sample.gpx
+++ b/gpsbabel/reference/route/tef_xml.sample.gpx
@@ -5,7 +5,7 @@ creator="GPSBabel - http://www.gpsbabel.org"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns="http://www.topografix.com/GPX/1/0"
 xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">
-<time>2005-06-29T16:04:54Z</time>
+<time>1970-01-01T00:00:00Z</time>
 <bounds minlat="50.271540000" minlon ="11.642810000" maxlat="50.756270000" maxlon="12.671250000" />
 <wpt lat="50.362350000" lon="11.903730000">
   <name>in Zedtwitz halb rechts halten auf B2 Hofer Strasse</name>

diff --git a/gpsbabel/tef_xml.c b/gpsbabel/tef_xml.c
index 885e2d484d082e1dabd0e24d8cbe577d900fd9f1..85308dbb41d656c2b43df567abb081ef1802e755 100644 (file)
--- a/gpsbabel/tef_xml.c
+++ b/gpsbabel/tef_xml.c
@@ -116,11 +116,11 @@ tef_header(const char *args, const char **attrv)
            {
                if (strcmp(avp[0], "Name") == 0) 
                {
-                   route->rte_name = str_utf8_to_cp1252(avp[1]);
+                   route->rte_name = xstrdup(avp[1]);
                }
                else if (strcmp(avp[0], "Software") == 0) 
                {
-                   route->rte_desc = str_utf8_to_cp1252(avp[1]);
+                   route->rte_desc = xstrdup(avp[1]);
                }
                avp+=2;
            }
@@ -218,11 +218,11 @@ tef_item_start(const char *args, const char **attrv)
        {
            if (0 == strcmp(avp[0], "PointDescription")) 
            {
-               wpt_tmp->shortname = str_utf8_to_cp1252(avp[1]);
+               wpt_tmp->shortname = xstrdup(avp[1]);
            }
            if (0 == strcmp(avp[0], "SegDescription")) 
            {
-               wpt_tmp->description = str_utf8_to_cp1252(avp[1]);
+               wpt_tmp->description = xstrdup(avp[1]);
            }
            if ((0 == strcmp(avp[0], "ViaStation")) && (0 == strcmp(avp[1], "true")))
            {

diff --git a/gpsbabel/testo b/gpsbabel/testo
index dede59b066ac33f413d1ef071d3ccc6cdf1398dc..c6ba99bdd32052e33888995f95bfe1349c533da0 100755 (executable)
--- a/gpsbabel/testo
+++ b/gpsbabel/testo
@@ -697,13 +697,11 @@ ${PNAME} -i geo -f geocaching.loc  -o geo -F ${TMPDIR}/geocustom.out
 ${PNAME} -i geo -f geocaching.loc -o text -F ${TMPDIR}/text.out -o html -F ${TMPDIR}/html.out -o vcard -F ${TMPDIR}/vcard.out #-o palmdoc -F ${TMPDIR}/pd.out
 
 #
-# TourExchangeFormat tef (read only)
+# tef "TourExchangeFormat" read test
 #
 rm -f ${TMPDIR}/tef_xml*
 ${PNAME} -r -i tef -f reference/route/tef_xml.sample.xml -o gpx -F ${TMPDIR}/tef_xml.sample.gpx
-grep -v "<time>" reference/route/tef_xml.sample.gpx > ${TMPDIR}/tef_xml.sample.gpx.ref
-grep -v "<time>" ${TMPDIR}/tef_xml.sample.gpx > ${TMPDIR}/tef_xml.sample.gpx.new
-compare ${TMPDIR}/tef_xml.sample.gpx.ref ${TMPDIR}/tef_xml.sample.gpx.new
+compare reference/route/tef_xml.sample.gpx ${TMPDIR}/tef_xml.sample.gpx
 
 #
 # PathAway Palm Database .pdb tests